22b2fd00a6b551e450b75ec1bb5a9488eea1ef52,uportal-war/src/main/java/org/jasig/portal/portlet/rendering/PortletExecutionManager.java,PortletExecutionManager,getPortletActionTimeout,#IPortletWindowId#HttpServletRequest#,722

Before Change


        final IPortletDefinition portletDefinition = getPortletDefinition(portletWindowId, request);
        final Integer actionTimeout = portletDefinition.getActionTimeout();
        if (actionTimeout != null) {
            return actionTimeout;
        }
        
        return portletDefinition.getTimeout();
    }
    
    protected long getPortletEventTimeout(IPortletWindowId portletWindowId, HttpServletRequest request) {

After Change


        final IPortletDefinition portletDefinition = getPortletDefinition(portletWindowId, request);
        final Integer actionTimeout = portletDefinition.getActionTimeout();
        if (actionTimeout != null) {
            return getModifiedTimeout(portletDefinition, request, actionTimeout);
        }
        
        return getModifiedTimeout(portletDefinition, request, portletDefinition.getTimeout());
    }
    
    protected long getPortletEventTimeout(IPortletWindowId portletWindowId, HttpServletRequest request) {